From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 18 May 2012 12:40:00 +0000 (+0100)
Subject: libxl: initialise ao when starting pvqemu for stubdomain
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8429
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=2030978b6ad0bb2f9bbbcfffb8e65da6ae8431e9;p=xen.git

libxl: initialise ao when starting pvqemu for stubdomain

libxl__spawn_local_dm requires the ao to be initialised.

Without this starting an HVM guest with a stub qemu hits the
    assert(ao->magic == LIBXL__AO_MAGIC);
in the STATE_AO_GC call from libxl__spawn_local_dm.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 4ad7d0216e..b1ca9db19a 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -858,6 +858,7 @@ retry_transaction:
             goto out_free;
     }
 
+    sdss->pvqemu.spawn.ao = ao;
     sdss->pvqemu.guest_domid = dm_domid;
     sdss->pvqemu.guest_config = &sdss->dm_config;
     sdss->pvqemu.build_state = &sdss->dm_state;